From: Florian Müllner <fmuellner@gnome.org>
Date: Tue, 10 Jun 2014 10:58:01 +0000 (+0200)
Subject: main: Actually use the correct schema for overrides
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2427
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b981a591c76176b1fb728131032368222c8f840a;p=gnome-shell.git

main: Actually use the correct schema for overrides

Fix commit ae2751a68b20ab to not only pick up the keys from the
correct schema, but also use the correct schema-id for the overrides.
---

diff --git a/src/main.c b/src/main.c
index a2f497cf8..4070482e1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -174,16 +174,19 @@ shell_prefs_init (void)
 {
   ShellGlobal *global = shell_global_get ();
   GSettings *settings = shell_global_get_overrides_settings (global);
-  char **keys, **k;
+  char **keys, **k, *schema_id;
 
   if (!settings)
     return;
 
+  g_object_get (G_OBJECT (settings), "schema-id", &schema_id, NULL);
+
   keys = g_settings_list_keys (settings);
   for (keys = k = g_settings_list_keys (settings); *k; k++)
-    meta_prefs_override_preference_schema (*k, OVERRIDES_SCHEMA);
+    meta_prefs_override_preference_schema (*k, schema_id);
 
   g_strfreev (keys);
+  g_free (schema_id);
 }
 
 static void